257cc6
@@ -309,9 +309,12 @@
public class SubProtocolWebSocketHandler implements WebSocketHandler,
 	 */
 	@Override
 	public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
+		WebSocketSessionHolder holder = this.sessions.get(session.getId());
+		if (holder != null) {
+			session = holder.getSession();
+		}
 		SubProtocolHandler protocolHandler = findProtocolHandler(session);
 		protocolHandler.handleMessageFromClient(session, message, this.clientInboundChannel);
-		WebSocketSessionHolder holder = this.sessions.get(session.getId());
 		if (holder != null) {
 			holder.setHasHandledMessages();
 		}
